Merge from 2.4:

Sun May  9 21:05:38 2004  Matthias Clasen  <maclas@gmx.de>

        Merge from 2.4:

	* gtk/gtkactiongroup.c (gtk_action_group_add_action_with_accel):
	Allow to suppress the stock accelerator by using "".  (#142196,
	David A Knight)

diff --git a/ChangeLog b/ChangeLog
index 9cac50573a98be2e212c73ce9ecd5770e1fe3cdb..dbff45fe77142be5b838730716a8f9d40ea0cecc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Sun May  9 21:05:38 2004  Matthias Clasen  <maclas@gmx.de>
+
+        Merge from 2.4:
+
+       * gtk/gtkactiongroup.c (gtk_action_group_add_action_with_accel): 
+       Allow to suppress the stock accelerator by using "".  (#142196,
+       David A Knight)
+       
 Sun May  9 02:01:13 2004  Matthias Clasen  <maclas@gmx.de>
 
         Merge from 2.4:

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 9cac50573a98be2e212c73ce9ecd5770e1fe3cdb..dbff45fe77142be5b838730716a8f9d40ea0cecc 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+Sun May  9 21:05:38 2004  Matthias Clasen  <maclas@gmx.de>
+
+        Merge from 2.4:
+
+       * gtk/gtkactiongroup.c (gtk_action_group_add_action_with_accel): 
+       Allow to suppress the stock accelerator by using "".  (#142196,
+       David A Knight)
+       
 Sun May  9 02:01:13 2004  Matthias Clasen  <maclas@gmx.de>
 
         Merge from 2.4:

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 9cac50573a98be2e212c73ce9ecd5770e1fe3cdb..dbff45fe77142be5b838730716a8f9d40ea0cecc 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+Sun May  9 21:05:38 2004  Matthias Clasen  <maclas@gmx.de>
+
+        Merge from 2.4:
+
+       * gtk/gtkactiongroup.c (gtk_action_group_add_action_with_accel): 
+       Allow to suppress the stock accelerator by using "".  (#142196,
+       David A Knight)
+       
 Sun May  9 02:01:13 2004  Matthias Clasen  <maclas@gmx.de>
 
         Merge from 2.4:

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 9cac50573a98be2e212c73ce9ecd5770e1fe3cdb..dbff45fe77142be5b838730716a8f9d40ea0cecc 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+Sun May  9 21:05:38 2004  Matthias Clasen  <maclas@gmx.de>
+
+        Merge from 2.4:
+
+       * gtk/gtkactiongroup.c (gtk_action_group_add_action_with_accel): 
+       Allow to suppress the stock accelerator by using "".  (#142196,
+       David A Knight)
+       
 Sun May  9 02:01:13 2004  Matthias Clasen  <maclas@gmx.de>
 
         Merge from 2.4: